Changing RETURNs to ACCEPTs was too aggressive

Change-Id: I84bd31265a152a7b7d90022805042858f152fc34
Updates to QoS API

Change-Id: I3aea2ab717c93f0961c18fcb9ef108226c477556
Add cleanup

Change-Id: I3f47f75d63d47227f4514c4c4a7deccd126d8a81