Merge changes from topic "am-19e9244725df4b0eb80716c24e59ab9c"

* changes:
  Merge changes from topic "am-8a210e51153e4e63bbaa44ae9cf03391" into oreo-mr1-cts-dev am: dedfb2ca1f
  DO NOT MERGE Add CTS test for URI fix. am: 53a9c9bc34  -s ours am: 175d980772  -s ours am: df249cbcbb  -s ours am: cebea26b62  -s ours
tree: e853df38a4cfac445da5c8c09439d780ca49595b
  1. tests/