Merge "Add userspace_reboot_log_prop"