Merge "Don't add a '/' if it's already there."
am: 73de384319

Change-Id: Id31d8646a0f090cb670a29a8785ea7b8d9e2f5a9