Merge "Update Settings subtexts for R." into rvc-dev am: fb39c70875
am: 76c2ec77e3
am: 3277ad0cf6
am: bfaf9af026
am: c97b40924b
Change-Id: I0e7c94c953b732821ff083b731207976e3469322
This commit is contained in: