[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: 6c683742 -s ours
am skip reason: Change-Id Id2d89287fe36240d71de2092daac44a5da9be282 with SHA-1 58f9ae30 is in history
Change-Id: I2622a960387c4556e82b90ad0155b0b18b372625