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

Change-Id: Ibd20375c157cb02bcfa8a2785f3042f1fa3f5d1b