Merge "Update Settings subtexts for R." into rvc-dev am: fb39c70875
am: 78e9bdf9b7
am: ef2bc18b14
am: f6d654d16a
Change-Id: I3859c8b4b1c6fb60d36630f4f3662d932ff9f140
This commit is contained in: