DO NOT MERGE Add CTS test for URI fix. am: 53a9c9bc34 -s ours am: efb0258e08 am: 2c7b1033b8 am: e3542ba9d1 am: e1544712ff am: bc161e0872 -s ours
am: 6329a0e2ae
Change-Id: Id9c6293718ad177e0c908df27a554c9f82f3b360
This commit is contained in: