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

Change-Id: I5e7ebf283edfeb3f66e55d1a3a46fd0b2cadf406