d2: bring it up to speed

Change-Id: Idfdfd4d229a9f7ec9c94b226459cbaf2f5c53bb9
d2 more consolidating

Change-Id: I622f1a0124282a951d04cf0458d3e887a6b1b4d8
 d2: rename class

Change-Id: I80bc9824aee96b343ce9a3fa299ecc04a557f69c
d2: cleanup cdma property

Change-Id: Id59f31054b41751a5d5c57102cb22c4aa1c266f3
d2usc: update fingerprint for LK5

Change-Id: I842da29d87ed27879343720d13fcdf9844151caf
Merge remote-tracking branch 'cm/cm-10.1' into HEAD