Merge "Remove code to handle non-default file encryption"