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

Change-Id: Ib9fe0ee2efdb9271e7a3a7d551d1e141438f192b