am fbeb8230: am dabb19fc: Merge "Increase the setup-sdp delay to cover for all the devices." into jb-dev

* commit 'fbeb823031de2e62e11ce680b2fa5238f2e125cd':
  Increase the setup-sdp delay to cover for all the devices.