Merge "[Settings] Code refactor" into rvc-dev am: c1b20e631a am: cc225237ed am: d429e9404d am: cc00b9fba0
Change-Id: I6cf337cb8015ff83098d351e286d845e85ac812f
This commit is contained in: