Merge "Remove no thread suspension assert in AddImageSpace" am: c71dc3852e
am: 82bdbde3d1

* commit '82bdbde3d1bbf3b59fd028a10ea86aa15de6c9c4':
  Remove no thread suspension assert in AddImageSpace