Merge "Move dependencies in prep for PhoneNumberInteraction move."