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

Change-Id: Idf2a5fc8e2dcd5c24bf78201ed2f09e1a1b3fe9f