Fix skip_path logic if path part is empty

This was the case for the image client.

Change-Id: I5568bf6781ad57524c033868c2ab9f2ba4bb566d
Merge "Fix skip_path logic if path part is empty"