Merge "Revise strings to up to date for accessibility button chooser." into rvc-dev am: 5ae93e4b58

Change-Id: I79c17a54a8814bceec2a37928c0b3c21f9e49a23