Merge changes I607ff18f,Icb8c3d77

* changes:
  Implement batch test for Sensors 2.0
  Implement VTS tests for Sensors 2.0 flush