am e784e44a: Fix issue 3158317.

* commit 'e784e44a0402aa4e9489e0b9f2f3d3685cf76a93':
  Fix issue 3158317.