am 9a8b98d1: am 33cca17c: Merge "Fix dialer monkey NPEs" into mnc-dev

* commit '9a8b98d1dbeaa348de9324271601e919b60858dc':
  Fix dialer monkey NPEs