am eccd6fdd: Merge change 20673 into donut

Merge commit 'eccd6fdd0d86b8610b738fc15c707eedc00ec9dc'

* commit 'eccd6fdd0d86b8610b738fc15c707eedc00ec9dc':
  Fix bug 2043140.