Merge "[Settings] Code Refactor" into rvc-dev am: 921ed942c0
am: 0a7fefde75
am: 14a0d430aa
am: 35ed1ee916
Change-Id: Iff58557be1bd2ab7a06692903adc20db317987d8
This commit is contained in: