Merge "[Settings] Code refactor" into rvc-dev am: 1de5f2e799
am: 646b02e4d6
am: 464179cee9
Change-Id: I41b2cb6f8e139ae3d422f9dff0891f508d2646d5
This commit is contained in:
1de5f2e799
am: 646b02e4d6
am: 464179cee9
Change-Id: I41b2cb6f8e139ae3d422f9dff0891f508d2646d5