Merge "Fix TrackInfo parcel write" into nyc-dev