[master] Merge in contact changes.