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

Change-Id: I7a4638a45594b0d72e82b396f4adcb2b010eef27