DO NOT MERGE Add CTS test for URI fix. am: ccd5db3a51  -s ours am: 65408dc312 am: c0411106a9 am: 02a78c5cf9 am: b1969e0aa9  -s ours am: e5a8397975 am: 673ab718c8 am: f1ff287aed am: 3fc40ec0d0 am: 67b508b029  -s ours
am: eb4c452ded

Change-Id: I5ad97178643f1e5cf3df8e2a387e7cffdbb04e6d