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

Change-Id: I7a78ea4a8b3a03ef2013d41f9788e554f73c990b