Merge commit '2795c2d6b73f6e72565569f7d4f2f4b34e526bba' * commit '2795c2d6b73f6e72565569f7d4f2f4b34e526bba': Fix a couple null pointer exceptions in CDMA voice call handling.
Merge commit '2795c2d6b73f6e72565569f7d4f2f4b34e526bba' * commit '2795c2d6b73f6e72565569f7d4f2f4b34e526bba': Fix a couple null pointer exceptions in CDMA voice call handling.