Merge "Fix Intent.ACTION_REBOOT"