Merge "Add safetyNet Logging comments and remove redundant code"