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

Change-Id: I4796f2eba128fa44f24d90958a1bcc3d9253cda1