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

* changes:
  Merge changes from topic "n1" into nougat-mr1-cts-dev am: 487ebc4c78 am: f18cae8f11 am: 578361a2bd am: f26da6af2c
  DO NOT MERGE Add CTS test for URI fix. am: 473b117757  -s ours am: 61b33ddbf2 am: fae5ab224b am: be7378e99b  -s ours