Merge "Add Vary: X-Forwarded-Proto for https redirects"