CDMA: Data connection bug fixes (4/4)

Change-Id: I3c30d7df42d76352dfa6fda88b7fc255124047dd