Merge \"ApplicationErrorReport: Sanitize stack trace\" into nyc-mr1-dev
am: a07af1ee35

Change-Id: I26689370456dd424474683fca95950bd229bbe73