am c857431f: Merge changes If2e86889,I5334d75b into lmp-dev

* commit 'c857431f346b27ebfc3228c369e422d8872afbef':
  Move from uri to name
  Clean up