am 1e1b6b72: Merge change 20514 into donut

Merge commit '1e1b6b7245a0a9212aa3b0366e7919f114895306'

* commit '1e1b6b7245a0a9212aa3b0366e7919f114895306':
  Fix bug 2022435.