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

Change-Id: If61ebc9abb0e9d94fafea68e70e4e2c77ed13a32