Hack fix the build

Change-Id: Ia8cec960113af8dfdd8fee0b085e15c9588ed9da