Merge "ART: Continue adding override annotations"