DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f -s ours am: 181a10e364 -s ours
am: 84a9da7ac9 -s ours
Change-Id: Ic32802e983f9a464d629873909380682f3fb2c34
This commit is contained in: