Merge "Revert "logd: validate and fill in socket credentials""