Merge "Wi-Fi, now corporeal!" into pi-dev am: bc6f64d557
am: 52779174be

Change-Id: I9779dc39c1bcd41c979141c8c8fac5e96701ae07