Add resource based mechanism to grant default permissions am: d44d46aa50
am: fb53efd8f3

Change-Id: I734a4186b92c4dfed45c0269b6d2419e7971e802