Merge "Change insecure HTTP resource link to scheme-relative link. am: fc175c08cb am: c67ea5e3ff am: 634f858088" into nyc-mr2-dev-plus-aosp