Merge "Revert "Remove skips for EnableCollection tests"" am: 480dc3c008 am: 05e1550ef6
am: 2496cce93a

Change-Id: Ie13a9fefc8f183c402433da9254c6bed9974170d