Merge "Revert "Fixing safteynet logging bug from ag/862848  - DO NOT MERGE"" into mnc-dev am: 957c386860 am: 00ff259b1a am: 1f9691a159 am: 2d758217fd  -s ours
am: 3598b0890d

* commit '3598b0890d8d42c0fb2661c1926c35e1bd0c0790':
  Revert "Fixing safteynet logging bug from ag/862848  - DO NOT MERGE"