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