Fixing a couple small issues with reordering (issue 7064138), (issue 7064337)

Change-Id: Iaaeb37f630a71f8fd54a6064602ddd10d4d4ab91
2 files changed