Merge "logd: validate and fill in socket credentials"