Merge "Merge framework-connectivity impl and stub targets"