Merge "Add resource based mechanism to grant default permissions" into nyc-mr1-dev
am: 9a6008a334

Change-Id: I6391719f2c978d508c8cd5e29c1d2c9cb173f3d7