[automerger skipped] Merge "Fix the description in string.xml" into rvc-dev...
[automerger skipped] Merge "Fix the description in string.xml" into rvc-dev am: cf5c30de am: f9b69046 -s ours am: f04d6f32 -s ours
am skip reason: Change-Id I406e3c29fabff18e4f8d966477f859b0ba1f5e9a with SHA-1 31c75447 is in history
Change-Id: Id5be3e6ae9064976e6e1f583f6edaab2fe607273