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

Change-Id: I4f0e6b89262f102756919467ec47786146ddbd7b