Merge "logd: reduce chance of dropped 1 messages"