Merge changes from topic "am-f19c1bc8474a40c18b6f95c5c34b395d" into nyc-mr1-dev

* changes:
  Merge changes from topic "am-7882172707e5453d9160ca56a0a63ffc" into nougat-mr1-cts-dev am: 941d9e9f6b
  DO NOT MERGE Add CTS test for URI fix. am: ccd5db3a51  -s ours am: 148c58bdb3  -s ours am: 39b2beb280  -s ours