Merge "Refactoring SystemSettingsProto to avoid method limit." into pi-dev
am: f2977ce61e

Change-Id: I56fb1bcfe409b9b44f91f2303af73f164e5ff528