Merge "Change insecure HTTP resource link to scheme-relative link." into nyc-mr1-dev am: 050cf854c7
am: 5a701867d5

Change-Id: I7f5b828bd0d68f58c96765be05eb851f45d7677d