Merge "Use PLOG and TEMP_FAILURE_RETRY for uevent socket errors"