Remove useless dependencies

Change-Id: I7594eecc07a625d4bd707867f35fc84307c3ed22
Merge "Remove useless dependencies"