am 97d9f286: Merge "ART: Some Quick cleanup"

* commit '97d9f286971a4c1eec70e08f9f18f990d21780d5':
  ART: Some Quick cleanup