Merge "Fix Wifi setup for xl." into honeycomb