sort based on serverId

Change-Id: Ibd4d8d3f0c7470ca05057b7628736f1b59352adc