Merge "Revert "Update permissions."" am: b37745eb98 am: f695a17db1
am: ac87113d27

Change-Id: I65cec1c0f28e94193c82be49096d020fe5491d83