Merge "logd: correct duplicate message state machine" am: 9fa0215e15 am: ebfba62dcb am: 70489ff0b6
am: 7c31d1fafd

Change-Id: I327c2ec68c3fbb94e6880dd050d1402730b0787b