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 am: 74e74a58
Change-Id: I95fa8461c09f1ef8924dacb79daaf0e36b07a901