Merge branch 'gautamd-Rel17-draft-patch-87728' of...

Merge branch 'gautamd-Rel17-draft-patch-87728' of https://forge.3gpp.org/rep/sa5/MnS into gautamd-Rel17-draft-patch-87728