am bea42fc5: am 5bd24642: am 1f70a4d6: Merge "Allow logging while replaying"

* commit 'bea42fc5bd1e4053e7cf7a3a51021d771d939f97':