Merge "logd: record and replay log messages"