Merge changes from topic "am-7882172707e5453d9160ca56a0a63ffc" into nougat-mr1-cts-dev
* changes: Merge changes from topic "am-0577043ff24a4117bd4867dedbf2b6df" into nougat-cts-dev am:bc18e7e105DO NOT MERGE Add CTS test for URI fix. am:1efb5151db-s ours am:dfbb7a24e1-s ours
This commit is contained in: