Merge "Make a11y settings display consistent" into nyc-mr1-dev am: 9d6bce3667
am: db54ab8193
am: c2be318cdf
Change-Id: Ie201e996b4985e0e59672adb0b5411235e3e5a2a
This commit is contained in: