Fix sorting of included groups

Change-Id: I41be5f33c94d3248e6a2c922ebb412f643277050
3 files changed