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