Merge "Revise strings as per string UX review" into rvc-dev am: c3d052a48c
am: a79f10ad09
am: caea466d57
am: b0606b537e
Change-Id: I5c059d21dcd7cb56a698733e7db2162123480992
This commit is contained in: