am cb24dac2: (-s ours) am df564009: am f87f5f90: Merge "crash_reporter: Fix tmp directory location"

* commit 'cb24dac289a9cbcbfb61c67e22e60556270a4458':