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

* changes:
  Merge changes from topic "am-fc4976ef3f1a43da90fcb5b64fad74c0" into nougat-cts-dev am: b2c973e6bd
  DO NOT MERGE Add CTS test for URI fix. am: ff97586f14  -s ours am: 1565484c71  -s ours am: e04a70b6d1  -s ours