Merge changes from topic "am-8a210e51153e4e63bbaa44ae9cf03391" into oreo-mr1-cts-dev

* changes:
  Merge changes from topic "am-0166235977bf44ffa6da136c3f46f686" into oreo-cts-dev am: d9aadde604
  DO NOT MERGE Add CTS test for URI fix. am: 53a9c9bc34  -s ours am: 175d980772  -s ours am: df249cbcbb  -s ours
tree: 6678dc9f5bb443088e8c2046cd627cef5bc101b2
  1. tests/