Merge "Re-enable EnableCollection/IsCollected tests" am: fdab1316e5 am: 5bd8470940
am: f7519d7c60

Change-Id: Ic1d584a40cd2b2b277cab0a0893242a3edceae84