am c1d2a896: am 13bdaf7c: Merge "Fixing a couple small issues with reordering (issue 7064138), (issue 7064337)" into jb-mr1-dev

* commit 'c1d2a896a72ab7a0636abafdaf45c6f524730d7c':
  Fixing a couple small issues with reordering (issue 7064138), (issue 7064337)