Merge "Fix google-runtime-int warnings." am: a1f4a1e am: bcad1d1
am: 0231e70

* commit '0231e7016dfe56625d6d01a1de468cd23d9cf01a':
  Fix google-runtime-int warnings.

Change-Id: I0e80a2b91b107375f3fb5836e8948e4f1ff72185