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

Change-Id: Ic1188106c7fef22db58a244094766510a646a644