Merge "Fix NPE in handlePinMMI" into mnc-dev