Merge "Fix batch scan test bug." into mnc-dev