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

Change-Id: I63cd0ca40e581d9f94a404d991acf843d69e8903