[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

Change-Id: Ia92919582d4a882bebbfbbd8f2909e4870d43cc4