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

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