Merge changes from topic "am-7882172707e5453d9160ca56a0a63ffc" into nougat-mr1-cts-dev

* changes:
  Merge changes from topic "am-0577043ff24a4117bd4867dedbf2b6df" into nougat-cts-dev am: 6198a40f55
  DO NOT MERGE Add CTS test for URI fix. am: ccd5db3a51  -s ours am: 148c58bdb3  -s ours