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

Change-Id: Ic7bc773162eab3e66e0e10befb187c0423a54540