Merge "Remove store_aggregation_counters argument from profile merging" am: 56701ba879 am: 554e0296cb am: 4b10f282a6
am: 07ebc75790

Change-Id: I4b24488b21afa7b02e7acf79fb56c4df443065ea