Merge "Merge changes from topic "default_permissions" am: 4dd28c02cd am: 51f25090a5 am: 2ccacf4269"