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

Change-Id: I376317a6c5d6dfe10643330e5582ce4051fb1b3d