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