Avoid printing URIs which can contain credentials

Fix for bug 1233275.

Change-Id: I24d8b57418eb678767b33840973a632eb2132c6a
Merge "Avoid printing URIs which can contain credentials" into milestone-proposed