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