Temporary hack to fix build error

Change-Id: I96b0af024a840e18e0f4aa33681a67fcd02363aa