Merge changes from topic "am-fc4976ef3f1a43da90fcb5b64fad74c0" into nougat-cts-dev

* changes:
  Merge changes from topic "am-df77b614140440a9aca0e4b8a4a83d73" into marshmallow-cts-dev am: 1c92fba1a9
  DO NOT MERGE Add CTS test for URI fix. am: ff97586f14  -s ours am: 1565484c71  -s ours