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

Change-Id: I376fdeddb57a923fd3a71086ef6f8e6021347cbb