Merge "Allow hal_dumpstate to collect AoC statistics" into sc-dev