Merge "logd: correct duplicate message state machine"