Merge changes from topic "am-a1e8782806b548b280daa90a2ff2320c"

* changes:
  Merge changes from topic "am-640962a57b8e46aa8b753bca730fb376" into oreo-mr1-cts-dev am: 9f63146b7d
  DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f  -s ours am: 181a10e364  -s ours am: 84a9da7ac9  -s ours am: 9dc912e515  -s ours am: ca0bfec15d  -s ours am: 482d1b4a62  -s ours
tree: 707c36f79dc5fd1297e2f970ac6d9f6c5a33e571
  1. tests/