Update Collection to master to fix production fatal

Change-Id: Ia9c80d3eb236f14757e07fc54913583a7d9e7fef
Merge "Update Collection to master to fix production fatal" into wmf/1.21wmf12