[automerger skipped] Fix potential stack overflow caused by integer overflow am: 1570b62c am: 5b4bf745 am: 6360e91b am: 3cd74938 -s ours am skip reason: Change-Id I0655b0b62301f78cd8705cc7b0e4fc11522f00ca with SHA-1 ec0d507e is in history Change-Id: Ife4a1d737088dbf51ac29f0a6411d9468b456593
mentioned in commit ca7a1eab