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

Change-Id: Ie35dd3d5ef954ee610a8924ac9dc6008344d0ac9