Merge "Add wifi support to the generic system image"