Merge changes from topic "am-fc4976ef3f1a43da90fcb5b64fad74c0" into nougat-cts-dev
* changes: Merge changes from topic "am-df77b614140440a9aca0e4b8a4a83d73" into marshmallow-cts-dev am:27e23e96caDO NOT MERGE Add CTS test for URI fix. am:36c5e0d87f-s ours am:181a10e364-s ours
This commit is contained in: