moto_msm8960: Moar OTA fixes

Change-Id: Ic94950a0ae73b0ea21004fe6e478d9ce15fcc0fb