am 3efbdf6f: (-s ours) Merge change 20267 into donut

Merge commit '3efbdf6f253f905c8672108a6329886105edec7c'

* commit '3efbdf6f253f905c8672108a6329886105edec7c':
  Do not merge