moto_msm8960_jbbl: Fixes for OTA

Change-Id: I284c6525c976f6903153cbe8c93dd2b5c1accd8c