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