am 38645ee6: (-s ours) Merge change 6759 into donut

Merge commit '38645ee6d61368f59b2d83256f2612bdaa38ff49'

* commit '38645ee6d61368f59b2d83256f2612bdaa38ff49':
  Do not merge