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

* changes:
  [automerger] Add CTS test for URI fix. am: 663b4dd598 am: fa2339c63d am: 662ce9724a am: 86b0dea18a am: ad9fa4877c am: bdbe861821
  [automerger] Add CTS test for URI fix. am: 663b4dd598 am: fa2339c63d am: 662ce9724a am: 86b0dea18a am: ad9fa4877c
  [automerger] Add CTS test for URI fix. am: 663b4dd598 am: fa2339c63d am: 662ce9724a am: 86b0dea18a
  [automerger] Add CTS test for URI fix. am: 663b4dd598 am: fa2339c63d am: 662ce9724a
  [automerger] Add CTS test for URI fix. am: 663b4dd598 am: fa2339c63d
  [automerger] Add CTS test for URI fix. am: 663b4dd598
  Add CTS test for URI fix.