Merge "Remove more entries not relevant to wifi-only devices." into honeycomb