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