Merge "crash_reporter: Fix unit tests" am: ec5b7d4b6c
am: 502f2c957d

* commit '502f2c957d42f89f678282c0f3fb3574aa9466fd':
  crash_reporter: Fix unit tests