Merge "Don't strip country and variant from locale." into mnc-dev