Merge "[Settings] Code Refactor" into rvc-dev am: 268bdc12c6 am: 949ec8a1f0 am: 155c698d4f am: a170198f0b am: f35562af9a
Change-Id: Ie81997761498a98a326c17d66216836722d38eed
This commit is contained in: