am 4bdab175: DO NOT MERGE WiMAX support

* commit '4bdab1751f0db3b2f03e8c58ef5c11a543dfa3c7':
  DO NOT MERGE WiMAX support