Merge "Verify number of Map entries written to Parcel" into nyc-dev