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

* changes:
  Merge changes from topic "am-df79034a46694ff0b7e47fa7f8bf9120" into oreo-cts-dev am: 5d90275b6e
  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