am 442bf4cd: (-s ours) am d7a8e845: (-s ours) am ec944728: Merge "DO NOT MERGE Disable WiMAX when "Data Enabled" is off" into gingerbread

* commit '442bf4cd1efb24ea29fcc3b6b4d54f89f3a1dc7a':
  DO NOT MERGE Disable WiMAX when "Data Enabled" is off