Modified to dynamically adjust the returned QoS length to ensure compatibility with older modules.Related: OS#6922 Change-Id: I872d882de4ce186f644b1b3ab684963050709d4f