am 516c9547: am e2390461: Merge "Fix crash in Dialer when CP2 is disabled"

* commit '516c95472d83a85769285c54fe9bc949c62a645a':