Merge "Refactor Module connectors for testing" am: 288c75d0 am: c8cc5781 am: de500155 am: c8573763 am: 41c107bc Change-Id: Ifa50d564a3aceafe1f3936f0d3fb9020467d8350