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

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