Merge "Verify APIs to migrate tunnel mode transforms"