Build fix

Change-Id: Idfdcbce3badea6c778249be6719cf88374effa6d