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

* changes:
  Merge changes from topic "am-19e9244725df4b0eb80716c24e59ab9c" am: 420c69b8a1 am: 688b3f537e
  DO NOT MERGE Add CTS test for URI fix. am: 53a9c9bc34  -s ours am: 175d980772  -s ours am: df249cbcbb  -s ours am: cebea26b62  -s ours am: e104b8132d  -s ours am: afbc49ee96
tree: e853df38a4cfac445da5c8c09439d780ca49595b
  1. tests/