fixed build errors

Change-Id: Ifff15969ee966b8e195b01810b2ca0f33927bc0b