Fix up build

Change-Id: I134119ca3794493e9384a6cd538cc63aa76ef9ab