Merge changes from topic "am-a1e8782806b548b280daa90a2ff2320c"

* changes:
  Merge changes from topic "am-640962a57b8e46aa8b753bca730fb376" into oreo-mr1-cts-dev am: 36e3d3ccf8
  DO NOT MERGE Add CTS test for URI fix. am: ff97586f14  -s ours am: 1565484c71  -s ours am: e04a70b6d1  -s ours am: 885d7b3f2b  -s ours am: 006efedc46  -s ours am: 71ad721813  -s ours