Merge "Improve to-space invariant error reporting in the CC collector."
am: cc78efadd1

Change-Id: Ide4761aaed3e6fc93be9a98a1a03432a13e182d1