am 36180ed8: Merge "Finish removing "inline" URI scheme"

* commit '36180ed8521a178ddf682a9cc831c072810d77ae':
  Finish removing "inline" URI scheme