Merge "Automatically grant URI permission as needed." into nyc-mr1-dev