Merge "Add SafetyNet logging for security fix." into tm-dev