WIP: Add back in the Dependencies generation

Change-Id: I89da63166e77cf4c7a2d5c7f94a618bedf7c212f