Merge "Add default-permissions"
am: d05e13d0a4

Change-Id: If359ee759e26b7b065060768db9f591d856f213b