CDMA: Data connection bug fixes (1/4)

Change-Id: I912a041c7bf2561bee35612e63bccbceb61e6f75