Merge change 20389 into donut

* changes:
  Fix some display string that contained an unused %s and an NPE