Minor fixes for Docker troubleshooting

Change-Id: I0f6aa43530cadc34e2b48f289dc0d951b2bbb8b0
Related-Bug: #1383741
Merge "Minor fixes for Docker troubleshooting"