Merge "[Settings] Code refactor" into rvc-dev am: c1b20e631a am: 18997b6dae am: 2544f3762f am: c88f8b8e40 am: 1ae72ddb9a
Change-Id: I3b417ce827c8db96ef6503e6b6cade8bbae3c68c
This commit is contained in: