fix #lp1384430: full sort order for plan1 of NJ

Change-Id: I7f3162af34d16bc5e801305c24438d098a9b09ef
Merge "fix #lp1384430: full sort order for plan1 of NJ"