Merge change 21522 into eclair

* changes:
  Dock changes:Docking station intents