am 47a7dc81: Merge "Incorporate network diagnostics during a bugreport" into mnc-dev

* commit '47a7dc81d0fedc1e85091f0e8a868768d0e8cadd':
  Incorporate network diagnostics during a bugreport