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

Change-Id: I158d8282bb2bb747d91335e1c0362631bdd4196b