Merge "Remove dumping raft logs" am: b5058cc1a2
am: 19c3b8497c

Change-Id: I990ad1d72b719ec4e1f787075a3af5874051d3dc