Merge "Remove store_aggregation_counters argument from profile merging" am: 56701ba879
am: 554e0296cb

Change-Id: I5a8574a21e25e246b140793c82fffd4965b35a04