Build fix

Change-Id: I9304067e85216608eabb8a1d2b1f6fb10156bd0b