build fixes

Change-Id: I74aee4791bd5f5e9f0ba7c05cac3702d6ec52b95