Merge "Fold WiMAX state into the mobile RSSI." into ics-mr1