DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db -s ours am: dfbb7a24e1 -s ours am: 8cb75edc3a am: 43aea5638c am: e37b9c0c15 am: 7529662078 am: 4173b8bf71 -s ours am: 6dc8d5cc2f
am: b4f3cd6459
Change-Id: I0be62d50b6930bc73fbdf7f7858227e650ffea3f
This commit is contained in: