Merge "Fix crash in NetworkControllerImpl" into mnc-dev