Merge "[Settings] Code Refactor" into rvc-dev am: 0d3732a595 am: 0b1cc9979e am: c39805c32e am: eda7705565
Change-Id: I96bb2316f7d5a1b71bfc147b7fef22cca19aa9a2
This commit is contained in: