[automerger skipped] Merge "Update Settings strings for R." into rvc-dev am:...
[automerger skipped] Merge "Update Settings strings for R." into rvc-dev am: 61e7d2c2 am: a8d78418 am: ca95aaae am: a56081df -s ours
am skip reason: Change-Id Id2d89287fe36240d71de2092daac44a5da9be282 with SHA-1 8694c34e is in history
Change-Id: Iad3de88305d13e965beb47e908d112475f05e231