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

Change-Id: Ib93f9aee2f4e916d4179f8aa95b67c0e2bff43df