Merge "Add default-permissions" am: d05e13d0a4 am: da9ebd5a17
am: 0ed4f917ac

Change-Id: I146d7f5126f3420d958234f961d0b6580260d65c