Merge "Create convert_fbe breadcrumb file to support conversion to FBE"