am 03e90322: Merge "Remove more entries not relevant to wifi-only devices." into honeycomb

* commit '03e90322db140139b19739fbe826494daa900773':
  Remove more entries not relevant to wifi-only devices.