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

Change-Id: Ibf58c209a59a7e9dc64976bafb5f4f9bfaa9a840