Merge "Fix build breakage after ag/912646" into nyc-dev