Merge "Allow boot_variable_file to be read from input_target_files" into main