Merge "Revert "Fixing safteynet logging bug from ag/862848  - DO NOT MERGE"" into mnc-dev
am: 957c386860

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