Merge "Remove skips for EnableCollection tests" am: abee76ef78
am: c39499edb3

Change-Id: I6df02e7c925dcf970f78ea1d6d1d5a5970b418b7