Merge change 25296 into eclair

* changes:
  Add new Gservices setting for discarding uphill ops for eclair and future devices.