am 657c80b1: (-s ours) Merge change 3775 into donut

Merge commit '657c80b146f8d6319bf059f4aea2fce3b15a50b6'

* commit '657c80b146f8d6319bf059f4aea2fce3b15a50b6':
  DO NOT MERGE.