proxy-server, take one

Change-Id: I526a2065d1d91d4ac88fa3c7c7e23936bac5c394