Moving the post-transaction addData to a place that makes a little
more sense.

Change-Id: I291441df704668fac4608dd339517dadbdb9fcd4
Merge "Moving the post-transaction addData to a place that makes a little more sense."