Merge changes from topic "am-3206387c023d4f72a961a49cfd1ef4e3" into oreo-mr1-cts-dev

* changes:
  Merge changes from topic "am-a8c42e83471740dd9885d0dcccdf8907" into oreo-cts-dev am: afff62b0b9
  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
tree: 6678dc9f5bb443088e8c2046cd627cef5bc101b2
  1. tests/