Merge "DO NOT MERGE Disable WiMAX when "Data Enabled" is off" into gingerbread