am de784d91: (-s ours) Cherrypick 3bfbbe2 from master. do not merge.

* commit 'de784d913123376a886b5e8c4e619b7f87484c5f':
  Cherrypick 3bfbbe2 from master. do not merge.