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

Change-Id: I6510e4bb75e0780baef8e7a80622d8bbad9a932a