Merge "Fix for the handling of SMS Delivery Report in case of CDMA network" into gingerbread