Merge "Fix problem of logd restarting." into udc-qpr-dev