Security fix for overflow check. am: ebb6f04c88
am: d44ed48f0c

Change-Id: I8e7fadc13fdda86735169a40a8fec6494bee278d