am: 38025bc7 * commit '38025bc7': Fix potential buffer overrun. Change-Id: I60b170a299f5c1f35e233ef41db528981453f40b