[automerger] Fix OOB access in Tremolo am: bc5c9c3a40 am: a709728a6f am: add22ecca3 am: 73dbe46cca am: aa028a5188 am: dd8b70395e am: 76d0dacbd6
am: 52bb122878

Change-Id: Ie2c62ab787da361b6acc81bfb5558ac8d9a446d3