pre-merge refactor-conn

Change-Id: I3ad0c9744ffa3b81bdd6023078aa795b054037b1