Merge "Fix build breakage" into nyc-dev