am 921d947: Merge change 1055 into donut

Merge commit '921d9479afef6d6df1ed9c60ef8f3110e4ad7fde'

* commit '921d9479afef6d6df1ed9c60ef8f3110e4ad7fde':
  Fix issue 1687880.