Updates from CM and also attempt to get OTA working.