Merge "Fix google-runtime-int warnings."