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

Change-Id: I5dc26ca9b65eb5e65367289717df65d61499a0ca