Merge "initial revision of NetworkDiagnostics" into mnc-dev