Merge \"Give the default storage manager access to the storage permissions.\" into nyc-mr1-dev
am: 0e5ac11d30

Change-Id: I15b7c3b9b2a2c4d4f62480effafd063d79a92dd2