am eb6e852e: Merge "ART: More Quick cleanup"

* commit 'eb6e852e1ed2b1c13e7b92a38a842dd42d60e82a':
  ART: More Quick cleanup