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

Change-Id: I97fc1ba28b14e59c01bb4561088883aaedb49e03