Merge "Re-enable EnableCollection/IsCollected tests"
am: 0eacf1be06

Change-Id: I96550df6c0e4cd9cb028dc86e5664bf4ac8ddb1e