Merge changes from topic "am-0166235977bf44ffa6da136c3f46f686" into oreo-cts-dev

* changes:
  Merge changes from topic "am-4532af43002d481bba66a249d6a74576" into nougat-mr1-cts-dev am: 3bfff62174
  DO NOT MERGE Add CTS test for URI fix. am: 5470431480  -s ours am: 3daf33c78e  -s ours