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: ca85815c am: 4da5f5c7
Change-Id: I561e175ae287b5c18581f29b218774e1aebea4d0