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

* commit '10e2607281ae3d6c5fa814b9986bac5f8b47d325':
  Fix multiple image space handing for SS collector