Merge "switch to using OWNERS from master branch of Connectivity module"