Merge change I98be2d63

* changes:
  msm7630: Get around boot up issue on some v2 hardware