am 5ea3d3a1: am c19e7f18: Merge "ART: Further refactor use lists"

* commit '5ea3d3a17ae318d85e181f5e5f23f8c3622fb9c6':
  ART: Further refactor use lists