Merge "Fix 2.0 VTS and 2.1 HAL/default implementation"