Merge changes from topic "am-fda3e51b99ba472293e34273b3249d2c" into oc-mr1-dev-plus-aosp

* changes:
  Merge changes from topic "am-4a80c23f3c6c420e98f1331a523bf986" am: 7aa66922dd am: 3d5a649ea6
  DO NOT MERGE Add CTS test for URI fix. am: 08044f045c  -s ours am: 7955a4e8d8  -s ours am: d89f75a3db  -s ours am: db4ab12068  -s ours am: 7c6875bef1
tree: e853df38a4cfac445da5c8c09439d780ca49595b
  1. tests/