Merge "ART: Simplify patchoat" into nyc-dev