[automerger] Make bound check proper in bbf_Scanner_addOutPos am: fb710d3c6a am: f2dd438ff3 am: 7942c8493a am: d5993d6f07 am: d3ee23d15a am: 2787b2a84e am: e26eac123a am: adf91e2219 am: c3914fb85a

Change-Id: Ia6399bf54d62125e6e2b5933a68972315ccbc8d7