Merge "Incorporate network diagnostics during a bugreport" into mnc-dev