Amend: Use ref syntax with uri. Change-Id: Idab7b0e23909b8fb30defa5453fa52f37952d062 Former-commit-id: 66fe560026848357ae165a675be9818da719675d