Merge "Extend Uri tests" am: 58f6083027 am: 84f8a51620 am: 91166928dc
am: c0681a2403

Change-Id: I45a96eb9e8ae0719b6ccfbf280a2dea3f2b06452