Adapt to dependency management

Change-Id: I8bc4124a22a0a4bdfe68b621bdb1e9764864903e