Merge "Remove internal dependency for PhoneGlobals/Phone"