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