Modify dependencies

Change-Id: I29039a46aa0a2158c8f73f0b26c52ec1082c7467