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

Change-Id: I45a96eb9e8ae0719b6ccfbf280a2dea3f2b06452
tree: bdbae05d7760163007dc9c18ce6df5e97792cd70
  1. tests/