am d11524c7: am 65ea6334: Merge "Protect against CP2 crash in Dialer" into mnc-dev

* commit 'd11524c726aaed4f30f3084a14bfafc627a355a9':
  Protect against CP2 crash in Dialer