Merge "[Partner request] Remove https and trailing slash in an https origin" into udc-dev