Merge "[Settings] Code Refactor" into rvc-dev am: 268bdc12c6
am: 9dda57cd21
am: a27ebac065
am: deef71c6eb
Change-Id: I122d1a98fd291bfd87e128d8df70c45f7f332de6
This commit is contained in: