Merge "[Settings] Code refactor" into rvc-dev am: 1ab100e936
am: 91f2c3d931
am: b4c2f8c4d9
am: 45dbbfa3fd
Change-Id: Ic1f6a7c9e2012e054b1bcde52a71a9eded7cf38c
This commit is contained in: