Merge "Revert "Revert "Fix vts cases due to function change for async r...""