[automerger skipped] Merge "Revise strings as per string UX review" am: 110d7ff721
am: 37c9c5b514
-s ours am: 76d2decd58
-s ours
am skip reason: Change-Id Ia510ce5262fbe576718b0785175c0a82acb3c722 with SHA-1 b8e0cd7989
is in history
Change-Id: Ie26da144a85365d571fc5cf3e40d2d6d1aa25f9c
This commit is contained in: