Merge "Bring back the priority feature for static RRO" into oc-dev am: 8f8a71d170
am: 88f49930bc

Change-Id: I19b082b9639b08ca584d46077f774a9f6f6a4223