Merge change 5732 into donut

* changes:
  Fix assertContentsInOrder (bug 1790350).