Merge changes from topic "am-26881935e2b34994a556637dd980465e" into oreo-mr1-cts-dev

* changes:
  Merge changes from topic "am-6b57b7386ef246a589ff8148ff9eae8b" into oreo-cts-dev am: fa209394f0
  DO NOT MERGE Add CTS test for URI fix. am: 08044f045c  -s ours am: 7955a4e8d8  -s ours