Fix compilation problem

Change-Id: Ib624bae3449c9e83dc546890b2aaaec19c5d5cea
Fix dependencies

Change-Id: Ie90add7bcbdb339bd8748719182f27cf3e1480a0