Fix potential buffer overrun. am: 38025bc7 am: 805b415b am: 0e17e184 am: 8e37aa19 am: e5c4e849 am: 46464a20 am: 3bbe8817 am: 63e01f73 am: a0af385a * commit 'a0af385a': Fix potential buffer overrun. Change-Id: Ic52a3476c569227eb2146b4ac653fb8a3f58e068