Merge "Fix an RuntimeExcpetion in GsmDCT.onDataSetupComplete" into ics-mr1