am 423572b4: (-s ours) am 8cca8f4c: (-s ours) am 141623d4: DO NOT MERGE WiMAX support

* commit '423572b4e2111a38553e2cc9fb239e1b0577cbab':
  DO NOT MERGE WiMAX support
tree: e3dc1d1be5560e29835ffbf945b61bbcd9cdeb9a
  1. core/
  2. services/