am 87346948: am eb6e852e: Merge "ART: More Quick cleanup"

* commit '873469485bdea366bdcd33ddad6a98e461357eac':
  ART: More Quick cleanup