Merge "Fix or suppress some google-runtime-int warnings." am: d9f80435b6 am: c852559529
am: d1f9e18561

Change-Id: I612fb5d62488da8f658c33ebda5ab28877eccb9d