Merge "Add ability to add existing connection AND set parent at the same time." into oc-dev am: 95f4f14e0b
am: 0aea0d2c53

Change-Id: I76805ba85bfac39cdaa3ddd2b8340423e4c7ffbe