CDMA: Data connection bug fixes (3/4)

Change-Id: I9eb75fc8f75992a35c73baa3a12f98c7984d8935