Merge "Remove support for converting from FDE to FBE"