am 99cc9752: am 72960975: Migration update: ensuring all folders go first

* commit '99cc97527169291953175288aa904a0215279c2a':
  Migration update: ensuring all folders go first