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

Change-Id: I878653770a5247cf50e09c16a76f82727a484af2