Fixing handling of aggregation mode

Aggregation mode was handled properly when each change
was in a separate transaction.  This CL makes it
work the same when multiple changes are made
within a single transaction.

Change-Id: I39b3c6378f02b2468e559e9d5227809ab463aa2d
4 files changed