Merge "Module: Add TestModule for dependency injection"
am: c310d49b97

Change-Id: Ic68642cd4cfda8b7059a61aef63bb990e9f2d84a