Merge "Remove import for PhoneConstants"