Merge "Add ApplicationErrorReport tests" into nyc-mr1-dev