am 8766bdcb: Merge "Fix parsing of old-style intent URIs" into lmp-dev

* commit '8766bdcb803698a2a2765bb46ab57bba655b41cf':
  Fix parsing of old-style intent URIs