un"fix": final status was being set twice after SET_PAYMENT

Change-Id: I0a111980a8e76d44deb75244aa9f9c35959092b7
Merge "un"fix": final status was being set twice after SET_PAYMENT"