Merge "Fix several accessibility magnification issues." into nyc-dev
am: 1f70f0b

* commit '1f70f0b7d60ad0b98fe6597162769bce8b85e3ed':
  Fix several accessibility magnification issues.

Change-Id: Ib174d8ff353fd990c5b3119b0728ec942784fbdc