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

Change-Id: I3091ec4046b5d36d8b5ee0359a97a1ed0e0bed9e