Merge "Remove skips for EnableCollection tests"
am: abee76ef78

Change-Id: I7590c1c6e78fa571edca778d11c0cc9bd2bdf7cb