Merge "Revert "Fix result does not get correct locale tag.""