Merge changes from topic "am-df77b614140440a9aca0e4b8a4a83d73" into marshmallow-cts-dev

* changes:
  Merge changes from topic "l1" into lollipop-mr1-cts-dev am: ba3927948d
  DO NOT MERGE Add CTS test for URI fix. am: 36c5e0d87f  -s ours
tree: 146373b019a4908790b019644ebfdd0db18b0aff
  1. tests/