Merge "fix swapped min / max in priority parsing" am: 557359863c
am: ec2d5d8f04

Change-Id: I900b742d6edf9f25039a4997e6e2d2f34849786a