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 am: ba31b8e4
Change-Id: I0e02cd17919cc6f5ad00ebd21c75cdc9c710bcc7