Merge changes from topic "am-4532af43002d481bba66a249d6a74576" into nougat-mr1-cts-dev
* changes: Merge changes from topic "n" into nougat-cts-dev am:a220d6d27dDO NOT MERGE Add CTS test for URI fix. am:53a9c9bc34-s ours
This commit is contained in: