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

Change-Id: I06530ba7524549cf6e938231c2eca384e8a3f132