X-Forwarded-Proto is empty for straight http

Change-Id: I236c25f345965b6551d42778d4480c4ca0860632
Merge "X-Forwarded-Proto is empty for straight http" into production