Add server list support

Change-Id: Idc1cd9cf78e5472e54e51c1a42cfe672056d572e
2 files changed