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

Change-Id: Ie022cbb6a7f900f637647b00eef38baee28bb34d