Merge "Revert "Add safetyNet Logging comments and remove redundant code""