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

Change-Id: I2645f0b942ea5998713cd880dc90d4d0fc8c6646