fix build issues

Change-Id: I8d94d4d47cca99683012f174825170b6803eb2ad