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
am: 71bda814da  -s ours

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