Merge "Deprecate AlteredCharSequence" am: ea4916dac7
am: cb90a87d2e

Change-Id: I55863aae50a20c17b18e25bbfda318eb4efe09d3