Merge change Ie9f76062 into eclair

* changes:
  Add Gservices flag for Vending doctor download complete timeout.