Slight tweak to grant list ordering

Change-Id: I7ffd9f8a8f3ff92ae0aeab45ecd60c009c4dde00
Merge "Slight tweak to grant list ordering"