am 76d79fb0: am f91bc870: am 67091f46: am a910a04b: Merge "Fix crash in NetworkControllerImpl" into mnc-dev

* commit '76d79fb097c2cb0731c67457f3f0cd72237c01e8':
  Fix crash in NetworkControllerImpl