Merge "[Settings] Code Refactor" into rvc-dev am: 0d3732a595
am: 5d88416ee0
am: 194be10913
am: 56b6bfe4d4
Change-Id: I4bf6403f04d6e0f1ffe185e23336ccc3ce7f222e
This commit is contained in: