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

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