Merge "Always initialize CDMA OTA state" into lmp-dev