Merge "Refactor Module connectors for testing" am: 288c75d055
am: c8cc5781e0

Change-Id: I3ad283828d42e88354f5a25eb47cbb6b66ae6236