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

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