Merge \"Add ApplicationErrorReport tests\" into nyc-mr1-dev
am: f86d855125

Change-Id: I57d00e200ebf03010fca4ae0753200b981faaad4