Merge "ART: Clean up API after change 102631"