Merge "Make sure to call back reportFinish() on the desired Handler." into nyc-dev