Merge "ART: Include cleanup"