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
Change-Id: I63a1ac8df3a475601a570bd40e8663b5336a8df4