fix build breakages

Change-Id: I6593d147506654d1a6eb0e597e2581ba750766d5