Update Collection to wmf3 for cherry-pick

Change-Id: I1eb30b85a6a372df83b07bfb10f7e2a7a275831f