[automerger] Make bound check proper in bbf_Scanner_addOutPos am: fb710d3c6a am: f2dd438ff3 am: 7942c8493a am: d5993d6f07

Change-Id: If78c89f60bb81e3e76012f40913fd3d3c5c8dcce