Merge "Fixed FillCallback.onFailure() and SaveCallback.onFailure() behavior."