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

Change-Id: Id08fcce15a8edb5985f76e2063a1bf8486c93b22