Add resource based mechanism to grant default permissions am: 59020bffb7
am: 34d85c6087

Change-Id: I1352cc49818be356321970533613741e1c3083b1