Fix multiple builds

Change-Id: I6414fbf877a019278d40f11d2cd6489216d36e85