Merge "[Settings] Code Refactor" into rvc-dev am: 921ed942c0 am: c2ea9a1fa4 am: f2c618840c am: 40cb885d6c
Change-Id: I0d3874de578d74aaeed5ad5e4f49b9f1a55a1e4a
This commit is contained in: