Merge "[Settings] Code refactor" into rvc-dev am: 05cb60b258
am: 403c8aa4ee
am: c0c78129c8
am: 7939abdcdc
Change-Id: I1c7e92823688311a04c717209f8ed960e56e8c8d
This commit is contained in: