Merge changes from topic "default_permissions"
am: 4dd28c02cd

Change-Id: I9c09fe88e0d5f36a13334a40bec17f8f8a530294