Merge "Add HCTR2 as an allowed mode for filename encryption"