Fix dependencies

Change-Id: I949e3e552d4397c4339716cf3c4df41facf9e9c9
Fix dependencies

Change-Id: I949e3e552d4397c4339719cf3c4df41facf9e9c9
Merge "Fix dependencies" into du44
Fix this again

Change-Id: I979e3e552d4397c4339716cf3c4df41facf9e9c9
Merge "Fix this again" into du44