Merge change 9071 into donut

* changes:
  Fix issue #2018454: NullPointerException in ImageSpan constructor