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

* commit '2a4e628412c8edece734645afdec1c5aa400c620':
  ART: Some Quick cleanup