Merge \\"Automatically grant URI permission as needed.\\" into nyc-mr1-dev am: d2e046a720
am: 1a932852d4

Change-Id: I1b54d8e32c4813d641df66075f3845f94858c63b