Merge change 3806 into donut

* changes:
  Fix a couple null pointer exceptions in CDMA voice call handling.