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

Change-Id: Ib2249dbdc6ff9f5a51a9c4b2d573c8d51231795c