Merge "Revert "Re-enable EnableCollection/IsCollected tests"" am: c068b7c63a am: c66b2f0e3a
am: d1e5127a59

Change-Id: I0872a6c408bda9e8be782c96c885c8c72c7b05a7