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