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

Change-Id: I9372e5202b739a56ec706e7d22e6a3f17c264b53