Merge "Removing should_flash_in_userspace check"