Merge "Extend Uri tests" am: 58f6083027
am: 71286682ce

Change-Id: I9849d90cbc73a04193daf8ab9fe5ab3c4a03f6d6
tree: 6c7f2e64d5fb133e405abbacb46132f06a8c5803
  1. tests/