Merge "Correcting a bug related to Uri permissions."