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

Change-Id: I69a2ecb191e639f1a7847ec17f2095933d22676f