am 9c6e501a: am 7d1e43c8: am 9659b777: am 40666299: am 1a27f4b7: am a009be85: am 5aa96df6: Merge "Remove the pointless ResolveInfo_DisplayNameComparatorTest. bug:13247366" into jb-dev

* commit '9c6e501a6ec6c2fa4f86df8b267622d68ae507f9':
  Remove the pointless ResolveInfo_DisplayNameComparatorTest. bug:13247366