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