Fix build Issues

Change-Id: I6d323a821358c70fa1a01dabee67fe068a02383f