Merge "Remove side effects of contact affinity."