Merge "[Settings] Code refactor" am: f4d59078fb

Change-Id: I65a011ca26c574d53d7ae3c2551fe6aa44f9c861