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: 4d9e3e69
Change-Id: I31b585f04afc08ed40494dcc7964cbb02425427b