connmgr fixes.. let's see if this holds up..

Change-Id: Ic2424cf0e93354e53277a351ae78093a3c1e12e7