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: 331dee0d am: 48e3a68b
Change-Id: I4518e1ca86d8d8ee5dfe1817cfe5f56abf91659b