am 40666299: am 1a27f4b7: am a009be85: am 5aa96df6: Merge "Remove the pointless ResolveInfo_DisplayNameComparatorTest. bug:13247366" into jb-dev * commit '40666299': Remove the pointless ResolveInfo_DisplayNameComparatorTest. bug:13247366