[automerger skipped] Merge "Remove dumping raft logs" am: b5058cc1a2 am: 19c3b8497c
am: b15cdfdb04  -s ours

Change-Id: Ice3906e2a8ef88c6a2439e62b026fd20281bd280