Merge "Remove package name from SafetyNet logs" into sc-dev