* changes: Merge changes from topic "n1" into nougat-mr1-cts-dev am: 76faaa3996 DO NOT MERGE Add CTS test for URI fix. am: 08044f045c -s ours
76faaa3996
08044f045c