am 7a8c4377: Merge change 2737 into donut

Merge commit '7a8c437723a50b171d0cd97cb17886b28dffce92'

* commit '7a8c437723a50b171d0cd97cb17886b28dffce92':
  Fixes #1878499.