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

* commit '466cf6a7fecca920274ce36c3667879e7c7112c4':
  ART: Some Quick cleanup