moto_msm8960: Fixes for OTA

Change-Id: I33fb067f760383f4a32504d6299d1fb1ba882a46