Merge "Re-enable EnableCollection/IsCollected tests"
am: fdab1316e5

Change-Id: I573dfefca8b2cf9673c15985a8554702c1be729f