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

* commit 'd981388e2ba8ddaf572f9d23ae669203b6543e55':