Merge "ART: Change UnresolvedMergedType merge"