[automerger] Merge "Add CTS test for URI fix." into lmp-mr1-dev am: 6025ecac21 am: dd9659910d

Change-Id: If13537fd7f7538cd2f07f95eb797d690ef343dce