Merge "Revert "Accept BCP 47 codes as aliases for nonstandard variants""