Fix build errors

Change-Id: Ic421e3e69e8ea6ce4801bf44aa85779333833786