Fix Dependencies

Change-Id: I039554cbe9cbf5d7fbe0cee54e5fff72e9d6a1c8