am 36e0ac79: Merge change 20389 into donut

Merge commit '36e0ac795e9ec37323e25e0acf04b3090fe4c266'

* commit '36e0ac795e9ec37323e25e0acf04b3090fe4c266':
  Fix some display string that contained an unused %s and an NPE