Merge changes from topic "am-0577043ff24a4117bd4867dedbf2b6df" into nougat-cts-dev
* changes: Merge changes from topic "mm" into marshmallow-cts-dev am:2996702607DO NOT MERGE Add CTS test for URI fix. am:1efb5151db-s ours
This commit is contained in: