Remove the broken dependencies

Change-Id: Ie851080219e78454d66749fee3883dadebd58678
Closes-bug: #1394584
Merge "Remove the broken dependencies"