Fix build errors

Change-Id: If98ec08fb884a6dfb891837e8c381298068157d4