Merge changes from topic "am-0577043ff24a4117bd4867dedbf2b6df" into nougat-cts-dev

* changes:
  Merge changes from topic "mm" into marshmallow-cts-dev am: 2996702607
  DO NOT MERGE Add CTS test for URI fix. am: 1efb5151db  -s ours
tree: a1fc7661a28ec1bcb88324a6a8f15b4bcff459d1
  1. tests/