[automerger] RESTRICT AUTOMERGE: Fix heap buffer overflow am: 07fd41b823 am: 2b4a5926e3 am: 1fac9d6472 am: 358e526ac9

Change-Id: Ie30ca18374d284918e65ac8d9fe5b59a3d34e191