Merge "SafetyNet logging from vendor."