am 1e2e44e9: Merge change 2365 into donut

Merge commit '1e2e44e900cb9a25d548e27a20d65292a7f321bc'

* commit '1e2e44e900cb9a25d548e27a20d65292a7f321bc':
  Fix wifi multicast API for public use.
  Revert "Bug fixes and performance improvements"