Merge "Add self-managed connection service API." am: 9f07a4ece2
am: b48c611c36

Change-Id: Icf49d1e7f744be9854e024c4d1770af30b055325