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