Merge "Entry -> Map.Entry. Fixes build break" into nyc-dev