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