More targeted dependencies

Change-Id: I76413b99f87bd0344e3105f9a98fd36c0d10a8c5
5 files changed