message "serverId" field is a string, not a long

Also remove some unused usage of serverId.

Change-Id: Ic421a77bfff6218a07d35f80219a2fae729ceb13
5 files changed