Merge "Remove usages of hidden connectivity APIs"