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