Merge "Remove spurious log" into nyc-dev