Merge "Modify wifi BatchedScan." into klp-dev