Merge "Extend Uri tests"
am: 58f6083027

Change-Id: I659a205aeaea9910115ce48e98cd858e8e8423b7
tree: ad64d0fa92c967932da1e9dd033ed84b0cf16430
  1. tests/