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

Change-Id: I65ac9f58e79a7c4b6909077afde422b7feeb2a0b