Merge changes Ie23877ac,I262f6be8

* changes:
  Revert "Disable some image_test cases with concurrent collector."
  Fix image_test for the CC collector.