Merge "[Settings] Code refactor" into rvc-dev am: 5bc8aa7961
am: c1eb5bf440
am: 44dbfa783b
am: 514643e79a
Change-Id: I30007b0bb2ab6f38492b89f0183a3f9427e2a394
This commit is contained in: