Merge "Resolve :32 to 32-bit variant only if the variant exists."