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

* commit 'a1f4a1ec3319ee1ab869a46805bff63550b56ca7':
  Fix google-runtime-int warnings.

Change-Id: If924b2e1b1e7e7bb4317fdca0c583b7de45db397