QuickHack for first compile

Change-Id: I587f50752a6f89ca00f42abc956b36ea84d67567