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

* commit 'd621727d0b785a69dda64ff6f87f52b3aea6014e':
  Fix crash in NetworkControllerImpl