Merge "logd: validate and fill in socket credentials"
am: 17254f59a2

Change-Id: I987d058e7245f5cb9a3603b3f52f7fa947d5dea7