Merge "DO NOT MERGE Change WiMAX indicator display" into gingerbread