Merge "Add new permissions"
am: 62ace8c46a

Change-Id: I618e2f4a608914d1bf679186880cd358a75a238d