diff --git a/core/check_elf_file.mk b/core/check_elf_file.mk
index 7a5de67..da4168d 100644
--- a/core/check_elf_file.mk
+++ b/core/check_elf_file.mk
@@ -40,13 +40,7 @@
 
 ifneq ($(strip $(LOCAL_CHECK_ELF_FILES)),false)
 ifneq ($(strip $(BUILD_BROKEN_PREBUILT_ELF_FILES)),true)
-# TODO(b/141176116): Remove the PRODUCT_CHECK_ELF_FILES condition below and
-# cover `make droid` targets after everything goes well with `make checkbuild`
-# targets.
-ifneq ($(PRODUCT_CHECK_ELF_FILES)$(CHECK_ELF_FILES),)
 $(LOCAL_BUILT_MODULE): $(check_elf_files_stamp)
-endif  # PRODUCT_CHECK_ELF_FILES or CHECK_ELF_FILES
-
 check-elf-files: $(check_elf_files_stamp)
 endif  # BUILD_BROKEN_PREBUILT_ELF_FILES
 endif  # LOCAL_CHECK_ELF_FILES
diff --git a/target/product/mainline_system.mk b/target/product/mainline_system.mk
index ccbc907..c880971 100644
--- a/target/product/mainline_system.mk
+++ b/target/product/mainline_system.mk
@@ -24,6 +24,9 @@
 # Enable updating of APEXes
 $(call inherit-product, $(SRC_TARGET_DIR)/product/updatable_apex.mk)
 
+# Mainline devices support userspace reboot
+$(call inherit-product, $(SRC_TARGET_DIR)/product/userspace_reboot.mk)
+
 # Shared java libs
 PRODUCT_PACKAGES += \
     com.android.nfc_extras \
diff --git a/target/product/userspace_reboot.mk b/target/product/userspace_reboot.mk
new file mode 100644
index 0000000..76ec83d
--- /dev/null
+++ b/target/product/userspace_reboot.mk
@@ -0,0 +1,21 @@
+#
+# Copyright (C) 2019 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Inherit this when the target supports userspace reboot
+
+PRODUCT_PROPERTY_OVERRIDES := ro.init.userspace_reboot.is_supported=true
+
+# TODO(b/135984674): configure userspace reboot related properties