fix build issues

Change-Id: I350968be2ae7068ad4323cdbaaed7a0112d8e4b6