[automerger] Merge "Add CTS test for URI fix." into lmp-mr1-dev am: 6025ecac21 am: dd9659910d am: 8b3227a44f am: 517e38e6d8 am: 26cfa78955 am: 1f9c3eaa02 am: e6d206044b am: e448a6a870 am: 9d02012ff4 am: 50f7ce3dbb
am: 160554cc4a

Change-Id: I8d7b389a9e5356f0ce5a54c412714acb0928f03d