am 8c1a3a22: Merge "ART: Some Quick cleanup"

* commit '8c1a3a22542bbe6f42649f1af7c579ddbb8134b2':
  ART: Some Quick cleanup