Revert^4 "Change CoreStartable @Dependencies to Injected Map"

This reverts commit 37cf0166090e251decf6c08da11a0326e0a2a958.

Reason for revert: Restore feature without the error-causing change.

Change-Id: Ic4de739cff659bc8c8708f4de11a8ca7081033b8
8 files changed