[automerger skipped] Fix potential stack overflow caused by integer overflow...

[automerger skipped] Fix potential stack overflow caused by integer overflow am: 64fc0f21 am: 8ab57b25 am: ce4a4443 am: ca166388 -s ours am: 26ffb552 -s ours am: 868233c0 -s ours

am skip reason: Change-Id I0655b0b62301f78cd8705cc7b0e4fc11522f00ca with SHA-1 c45ee0e1 is in history

Change-Id: Iffbda7d757b980228b301842e36144f03b26ac20