Merge "Merge "Add additional checks to multicast tests" into oreo-cts-dev am: d7ab0877dc" into oreo-mr1-cts-dev
am: e1d35d1a3e  -s ours

Change-Id: I5d1deb055ea53e8cdf4fbc25c634e8da45706712