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

Change-Id: I5883ac7d3368c400550ddfd76f813895f4d8007b