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

Change-Id: If762616920b266064cd1ee5520d5778ebb1475a7