am c41a0eff: am be22605d: Merge "Listen for HTTP proxy changes and propagate...
am c41a0eff: am be22605d: Merge "Listen for HTTP proxy changes and propagate the information to the media" into jb-mr2-dev
* commit 'c41a0eff':
Listen for HTTP proxy changes and propagate the information to the media