Merge changes I336c21fd,I9bd9c2a9,I33fef133

* changes:
  wifi(implementation): Fix formatting
  wifi(implementation): Dual interface support
  wifi(implementation): Use real iface names