am 1e690b69: am 0983eadf: Merge "Fix BatchScan request coalesing" into klp-dev

* commit '1e690b693c2d4ee7ba04d5882f6b5889ada07e0a':
  Fix BatchScan request coalesing