Merge "Add two interop tests, fix is done in ag/25579706" into udc-mainline-prod