Merge "Nullability check for locale module"