Merge "Respect breadcrumb to convert to file encryption"