d2: bring it up to speed

Change-Id: I975e24489bf97a1ba77fd22402e7f0682aaea636
d2: cleanup cdma property

Change-Id: I94adabff1df062c81b61d3692f24daf021700310
Signed-off-by: travp624 <travp624@gmail.com>