Merge "Fix some issues with TelecomBroadcastReceiver"