Merge "Fixing safteynet logging bug introduced in ag/862848" into mnc-dev