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