[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 am: af8bd4f764 am: f88ab0b1d9 am: d8561ce960 am: 7a0257de7c am: 1f787de248
am: 65a87c861d

Change-Id: Id7a72e923bc1d5576e5ad386c0dfcd46e16675d3