Merge "[Settings] Code Refactor" into rvc-dev am: 921ed942c0
am: c2ea9a1fa4
am: f2c618840c
am: 40cb885d6c
am: 41464d808f
Change-Id: I6392053f60ede29fe6b1717115a7d70cb55da04f
This commit is contained in: