Merge "Add developer option to convert from FDE to FBE"