Build fix

Change-Id: I91b343da5b73aa960f7447135f93dedd76e81527