Merge "Fix INTENT_RECONNECT_ALARM_EXTRA_xx, make strings meaningful."