Merge "Use multi-field logs to log permissions"