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: f1a24c88 am: e2a93193
Change-Id: I3b1d0a8b52ed9f4465291de06af8e1e9890e74ba