g2: TEMP: Fix CDMA

(reverted from commit e2bcc5063c205a59d9c6c221a63c4f7fab2ac896)

Change-Id: I7d52c8dce7eb48b8c0d763ca4d6d0c27dc383e0d