Autofill/auto assign based on server display order

Change-Id: Iee059472f022295754b5987172b95379d9de883a