am ac7774e8: Merge "Do not fix uris inside the system." into lmp-mr1-dev

* commit 'ac7774e8c13e5e2881a588012b8710ad3947169c':
  Do not fix uris inside the system.