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