Merge "Revert QosCallbackException constant values"