Merge "Add Qos Callback files"