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