Merge "Fix pointer-to-int and int-to-pointer warnings."