Merge "Update framework code after new ART options."