Merge "Refactoring usages of priority methods and constants to use connection policy instead."