am 63cc3b92: (-s ours) am f018bd8c: (-s ours) am 36469186: DO NOT MERGE WiMAX settings menu

* commit '63cc3b92f98758116613a5984ecd4aa65d050bbe':
  DO NOT MERGE WiMAX settings menu