am 432900bf: Merge change 2962 into donut

Merge commit '432900bffb816f56f5f8058c90fed7731df46e23'

* commit '432900bffb816f56f5f8058c90fed7731df46e23':
  Fixes #1890914.