Merge changes from topic "am-a5bc4e54a433400f95783af4f8ba4da2"

* changes:
  Merge changes from topic "am-3206387c023d4f72a961a49cfd1ef4e3" into oreo-mr1-cts-dev am: 105ca148a7
  DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db  -s ours am: dfbb7a24e1  -s ours am: d9ac06f2c2  -s ours am: bdf5a47c67  -s ours am: 39127a559b  -s ours
tree: e853df38a4cfac445da5c8c09439d780ca49595b
  1. tests/