Merge "Revert "Re-enable EnableCollection/IsCollected tests""
am: c068b7c63a

Change-Id: I75d87004cb8ffe720baa42c87f8654fc5d32a11f