Merge "Reading from logd in WRAP mode is expected to take a long time, don't abort it after 30s." into oc-mr1-dev