Bring back wpan

Change-Id: I977c6439a295fe2de1f115af8ab8f3e8828cd967