Port wimax support changes from CM9.