am c01fd043: (-s ours) am 4bdab175: DO NOT MERGE WiMAX support

* commit 'c01fd043a92462f12210d45a92d751b49e0e1f62':
  DO NOT MERGE WiMAX support