Merge "Fixed a bug where min-priority were in the middle" into oc-dev
am: 7ddf54211f

Change-Id: I7cbee601bd0401e7ac20fdd2d2527f11dafcb068