server single fix

Change-Id: I92affca36edbadd5c5aea10a72a69e44932b31d9
6 files changed