Merge changes from topic "am-325cd506-a538-4cb7-a65c-bc30576c59e9" into cw-f-dev

* changes:
  [automerger] Add CTS test for URI fix. am: 663b4dd5 am: fa2339c6 am: 662ce972 am: 86b0dea1 am: ad9fa487 am: bdbe8618 am: e6994c0f am: 866acd2f
  [automerger] Add CTS test for URI fix. am: 663b4dd5 am: fa2339c6 am: 662ce972 am: 86b0dea1 am: ad9fa487 am: bdbe8618 am: e6994c0f
  [automerger] Add CTS test for URI fix. am: 663b4dd5 am: fa2339c6 am: 662ce972 am: 86b0dea1 am: ad9fa487 am: bdbe8618
  [automerger] Add CTS test for URI fix. am: 663b4dd5 am: fa2339c6 am: 662ce972 am: 86b0dea1 am: ad9fa487
  [automerger] Add CTS test for URI fix. am: 663b4dd5 am: fa2339c6 am: 662ce972 am: 86b0dea1
  [automerger] Add CTS test for URI fix. am: 663b4dd5 am: fa2339c6 am: 662ce972
  [automerger] Add CTS test for URI fix. am: 663b4dd5 am: fa2339c6
  [automerger] Add CTS test for URI fix. am: 663b4dd5
  Add CTS test for URI fix.