Merge "Change locale comparison API"