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

Change-Id: I8ae41d7eb65ad5e3907880df2ca2dcf503735d2d