Merge "Adjust AssertToSpaceInvariantInNonMovingSpace for Sticky-Bit CC."
am: 9976b4e783

Change-Id: I38bfbc3fb16e2d2d7ba04d4d3013ff2f29650e97