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