Settle on QoS convention

Change-Id: Id670762c20c1f4232f77d564b0354371cd615f8a