am daf0b895: Cherry-pick f0e5e933 from master.

* commit 'daf0b895e8e0c952cc8563972d74a5e06fba7d0b':
  Cherry-pick f0e5e933 from master.