fix build errors

Change-Id: Ide442de86cd55fa717d8f142f58b9cb6066c50da