Merge "Clean up references to FDE in documentation and comments"