Merge "Refactoring usages of priority methods and constants to use connection...
Merge "Refactoring usages of priority methods and constants to use connection policy instead." am: 622e5190
am: 3a165935
Change-Id: Iec14b63f992f6e0ccf0eeb9058467ab24fe1d695