fix build errors

Change-Id: Icbd04618820ca900287d9be6891f46c8f18c6067