[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: 83d06ef1 am: adc46629 -s ours
am skip reason: Change-Id Id2d89287fe36240d71de2092daac44a5da9be282 with SHA-1 58f9ae30 is in history
Change-Id: Ic4d73cf339a8d51e5d0f4dbd3a83bc4d8dc38def