Resolve linking problem

Change-Id: Ib4e28dde0906bf9b361a187be7f4c9df334bf4eb