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