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

Change-Id: I9f018c8e1c796fb2fe41617483cf0e43acefd966