am 3da10728: am 453c0d5f: Merge "DO NOT MERGE: Enable http-live support for https:// urls, fix a parsing issue." into honeycomb-mr1

* commit '3da107288d5ae112073875ac10317def3c299818':
  DO NOT MERGE: Enable http-live support for https:// urls, fix a parsing issue.