Fix dependencies for the devices I maintain

Change-Id: Id658a912518da266e1a0cba4b23a5edc8f800046