[automerger skipped] Fix potential stack overflow caused by integer overflow...
[automerger skipped] Fix potential stack overflow caused by integer overflow am: c45ee0e1 am: b8134ff3 -s ours
am skip reason: Change-Id I0655b0b62301f78cd8705cc7b0e4fc11522f00ca with SHA-1 36a3f052 is in history
Change-Id: I2d54dc3becde918d809bfc2f970bc192bb562b1b