am 1fcabd7b: (-s ours) Merge change 8677 into donut

Merge commit '1fcabd7b328ddde7008d4ba2c401aa7db371ae74'

* commit '1fcabd7b328ddde7008d4ba2c401aa7db371ae74':
  DO NOT MERGE.