Integrate integer overflow fixes from security branch

Change-Id: I856f9d66607702824d6ef81a41260ccddabfac83
8 files changed