Merge "bullhead: fix broken build due to typo" into nyc-dev