Merge commit '41c104339951e0e5e78240e1f48455c21b3ba5fd' * commit '41c104339951e0e5e78240e1f48455c21b3ba5fd': Fix MulticastLock API to match WifiLock API.
Merge commit '41c104339951e0e5e78240e1f48455c21b3ba5fd' * commit '41c104339951e0e5e78240e1f48455c21b3ba5fd': Fix MulticastLock API to match WifiLock API.