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

Change-Id: I0aaa6e817f5e81dec778fda976cf2b655dc45a6b