Fix autodiscover to work w/ new connection manager code

Bug: 6916100

Change-Id: I690010431dff1658efa07acbcacb442b444829eb
2 files changed