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

Change-Id: I9f6db9cc4b61645895d76130222c2ff3d903567b