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

* commit 'c19e7f187d744992072e2e56cb3b131fb4c140f8':
  ART: Further refactor use lists