am: 805b415b * commit '805b415b': Fix potential buffer overrun. Change-Id: I5c6959756d219ddcdb200318869d781bc3d99e93