Merge "Fix multiple image space handing for SS collector" am: 10e2607281
am: 7b5d3041a2

* commit '7b5d3041a2b84ed55f8655af31705e1a591ad69b':
  Fix multiple image space handing for SS collector