am 5e223d8f: am d981388e: (-s ours) am db639251: am 5cab5290: Merge branch \'rewrite-crash-reporter\' into merge-crash-reporter

* commit '5e223d8f36ec2df1d13e0f5c9b67fd63cdc9d432':