Merge "remove sensitive pii from safetynet logging" into rvc-dev