Merge "ART: Dump less maps" into nyc-dev