Merge "Fix 64-bit build error" into mnc-dev