backport changes in Collation from master

This includes:
* I96bbcd73e75f9fc85a5c0b402eae87e5cda2259e
* I976dedfdc651fcc96a2291934924aa40b27f4c2f
* I4bd3d39ec2938a53e2c6728adc48ee6cf9778d74

Change-Id: Ibe25d9ec070720316202f31c429623bdcb840095
Merge "backport changes in Collation from master" into REL1_21