Merge "Revises the strings to meet the the activity-based accessibility...
Merge "Revises the strings to meet the the activity-based accessibility feature." into rvc-dev am: 19319b85 am: c294b38a am: de66d776
Change-Id: I20ec4fa201fff2cefb1bae9544c77adfff391827