Merge "Revise strings to up to date for accessibility button chooser." into...
Merge "Revise strings to up to date for accessibility button chooser." into rvc-dev am: 5ae93e4b am: 617c1e60 am: 23ee5af1 am: e9aa3cb8
Change-Id: Ia172047d158d87c0d708378b3380c1085897dda6