am 6995c859: am 4dd37adc: Merge "ART: Clean up API after change 102631"

* commit '6995c8591f2257ec4e419aed3458a28a960d3ba4':
  ART: Clean up API after change 102631