Merge "Fix google-runtime-int warnings." am: 603df0e am: 6eaa916
am: f648232

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

Change-Id: Ib25535ab05162499bb6734498259cadd82fff1e6