Merge "Update framework code for the API renaming of ART Service."