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

* changes:
  Merge changes from topic "am-fc4976ef3f1a43da90fcb5b64fad74c0" into nougat-cts-dev am: f582e9dede
  DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f  -s ours am: 181a10e364  -s ours am: 84a9da7ac9  -s ours
tree: 437a5c2b9bb14a7ffac6c80b297d67d10065ee21
  1. tests/