[fix-all 2] Fix incorrect reordering for all#701

simonmar wants to merge 3 commits intofacebookincubator:mainfacebookincubator/Glean:mainfrom

simonmar:fix-all-2simonmar/Glean:fix-all-2Copy head branch name to clipboard