Merge "Fix build due to merge issue" into nyc-dev