This commit cherry-picks 49a45422
for serf webdav version.

Change-Id: Ic5aba4fba8f8a2a521224b08865500dd932e85bf