Fix build after all these merges

Change-Id: I84744e016a908c104264c76d8ae7e2928b6fb98b