Merge "Add SafetyNet logging." into tm-dev