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

Change-Id: I5a78477bb523eb05f1a29c78ebc44074dd898070