am 9d981343: Merge change 2732 into donut

Merge commit '9d981343c9d187b4746ed1f3658224d9551d51c8'

* commit '9d981343c9d187b4746ed1f3658224d9551d51c8':
  Fix for #1878497.