Fix For Build Issue

Change-Id: Ifc97af707a371e191efce94d366c4788f4108caf