Merge "Fixing safteynet logging bug from ag/862848  - DO NOT MERGE" into mnc-dev am: 49c04280f2 am: 97f1356544 am: 89896480e0 am: 571c285ca6  -s ours
am: 7108ff311c

* commit '7108ff311c65787ea64b3c6f18ddb6f28f6a1d4e':
  Fixing safteynet logging bug from ag/862848  - DO NOT MERGE