Merge "Store aggregation counters for boot image profile" am: babb027669
am: 042adbb7d9

Change-Id: I4aeeba7df8f5b54be40f9161960ce6c91cc2bcd4