Fix build errors, again

Change-Id: I2fade95325acff86bc2d7e9ec2e641d512a1d5ed