Merge "Set the global priority session immediately after its flag is set" into oc-mr1-dev am: 0e4fcfe95d
am: aceb151552

Change-Id: I4154c02de108bf502e4f83285f328ac67b59b38e