Merge "logd: correct duplicate message state machine" am: 9fa0215e15
am: ebfba62dcb

Change-Id: I1c0a344e926bbd92308131c7ba6c1c47364cfee9