[FP5-1832]Porting DSD clientid solution from FP4

* Root Cause
  porting code
* Solution
  Porting DSD clientid solution from FP4
* Test Steps
  none
* Test Result
  pass

Change-Id: Ie539ac7c6d96aede233b2704fb964bbbc1dafb9d
(cherry picked from commit a364b897f3fb2eb01ab56d60dda2e44d9b54ab8f)
2 files changed