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

* commit '8cca8f4c4fbb4ffe2e5e83b91d17eba6ba28f950':
  DO NOT MERGE WiMAX support