Merge commit 'f0165495951e3a32aa5697ac1299307c2d72f32a' * commit 'f0165495951e3a32aa5697ac1299307c2d72f32a': Updates to SDK troubleshooting doc, per bug 2315781.
Merge commit 'f0165495951e3a32aa5697ac1299307c2d72f32a' * commit 'f0165495951e3a32aa5697ac1299307c2d72f32a': Updates to SDK troubleshooting doc, per bug 2315781.