Make it not depend on cloud_server

Change-Id: Ie82a06ab17ca5e240518af89e986869087547a39