am 6c131744: am 9db04571: am eeb2a73b: Merge "Fix for devices with multiple multicast-capable interfaces" into lollipop-mr1-cts-dev

* commit '6c1317441f37076ecdcf826065cee786b6bb83f9':
  Fix for devices with multiple multicast-capable interfaces