am 39665367: Merge change 3317 into donut

Merge commit '3966536766cbe0bd45570c6785e912131911ff79'

* commit '3966536766cbe0bd45570c6785e912131911ff79':
  Fixes #1899273.