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