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

Change-Id: Ifa50d564a3aceafe1f3936f0d3fb9020467d8350