[automerger skipped] Merge "Revise strings as per string UX review" am:...
[automerger skipped] Merge "Revise strings as per string UX review" am: 110d7ff7 am: 37c9c5b5 -s ours
am skip reason: Change-Id Ia510ce5262fbe576718b0785175c0a82acb3c722 with SHA-1 b8e0cd79 is in history
Change-Id: If4c9096dfea1c44e69e0245af680c3b6c9373a88