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

Change-Id: If2740716c8e5093176a839f880d8681109e63356