Merge changes from topic "am-177bacee3d764303895ed5e1e72bf859" into oc-dev

* changes:
  Merge changes from topic "n1" into nougat-mr1-cts-dev am: 76faaa3996 am: ce2230abfd am: 23d6ba00ec am: f26da6af2c
  DO NOT MERGE Add CTS test for URI fix. am: 08044f045c  -s ours am: 78f5d24a4f am: 2f42f87a5f am: be7378e99b  -s ours
tree: f053791b2ab65c58895d16b53dad660248e0a11b
  1. tests/