Merge changes from topic "am-19d0b20ea6e84d16b2530475ea505475" into oreo-mr1-cts-dev

* changes:
  Merge changes from topic "m" into oreo-cts-dev am: f40fcd461a
  DO NOT MERGE Add CTS test for URI fix. am: a02bbf31c4  -s ours