Merge "Fix DominatorTree for locale and mcc/mnc config"