Merge "Fix build break due to 32/64 bit compilation." into nyc-dev