Merge changes from topic "am-4532af43002d481bba66a249d6a74576" into nougat-mr1-cts-dev

* changes:
  Merge changes from topic "n" into nougat-cts-dev am: a220d6d27d
  DO NOT MERGE Add CTS test for URI fix. am: 53a9c9bc34  -s ours
tree: 437a5c2b9bb14a7ffac6c80b297d67d10065ee21
  1. tests/