Merge changes from topic "am-640962a57b8e46aa8b753bca730fb376" into oreo-mr1-cts-dev

* changes:
  Merge changes from topic "am-df79034a46694ff0b7e47fa7f8bf9120" into oreo-cts-dev am: de16c72207
  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
tree: 4dc73dbab6acb2851f5ad24beb73edb13278a932
  1. tests/