Update Collection to master tip

Change-Id: I01a242c99ece7cf09278b4076c6d5f54dfb70139
Merge "Update Collection to master tip" into wmf/1.23wmf9