fix build errors

Change-Id: Ia54e6fc45e309a9d2533c0b0e4665f7161d4b996