[automerger skipped] Merge "Update Settings strings for R." into rvc-dev am: 61e7d2c24c
am: a8d78418c0
am: 83d06ef1f4
am: adc4662924
-s ours am: 5bedf5a2dd
-s ours
am skip reason: Change-Id Id2d89287fe36240d71de2092daac44a5da9be282 with SHA-1 58f9ae3096
is in history
Change-Id: I3899aee3601d28bb9f2f0db0276260950ca802e9
This commit is contained in: