Merge remote-tracking branch 'origin/feature/qos' into merge-branch

Change-Id: Ie2617cb5e502b49e8c33bb47ad295c80e53b769a