Merge "Add additional checks to multicast tests" into oreo-cts-dev