am a910a04b: Merge "Fix crash in NetworkControllerImpl" into mnc-dev

* commit 'a910a04b8a079a01d684266875eb18c318012de4':
  Fix crash in NetworkControllerImpl