Merge "Use hexadecimal collation key for name searches." into ics-mr0