Merge change Ia36d8e74 into eclair

* changes:
  Updates to SDK troubleshooting doc, per bug 2315781.