Merge "Stub HAL now can test abort and fail events" into nyc-dev