Merge "Add support for aggregation counters in the profile"
am: 710a3a7553

Change-Id: I17427eb964988a03c8e4bbadd4683cd3da910622