Add missing dependencies

Change-Id: I3f2dc437df5b78dca7723f77ab2319cf5a2e41b8
Merge "Add missing dependencies"