am 21bd2e5b: am a8b20cf8: am bcfc634d: Merge "Ensure URIs have content:// scheme in WPM" into klp-dev

* commit '21bd2e5b0a8ccd065b8bbffb845159ce59640a9a':
  Ensure URIs have content:// scheme in WPM