Merge "[Settings] Code refactor" into rvc-dev am: 5bc8aa7961
am: 0987923594
am: 209d3699b5
am: c827609e3e
am: 9df1698cea
Change-Id: I1f159d6222fab643e0c71f57a15360e1bb974bf6
This commit is contained in: