[automerger skipped] RESTRICT AUTOMERGE: Fix heap buffer overflow am: 8adcfda134 am: 52eb1741ce
am: 5a23c5a3d3  -s ours

Change-Id: I8955d0aab0a44db706f04c43734e194ce709d62c