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