fix build errors

Change-Id: I1b61731d53b4ba6fe5c8e486bc9b40659c6e9e4d