Merge "[Settings] Code refactor" into rvc-dev am: 5bc8aa7961 am: 0987923594 am: 209d3699b5 am: c827609e3e
Change-Id: Ic7310f06c9a627e0618753e89b59fdad404cb4d9
This commit is contained in: