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

* commit '603df0e875a43cb045e9235b95f8a883f1722f1d':
  Fix google-runtime-int warnings.

Change-Id: Idc70dd39818a14f11a6dd6fae7955700a0abac66