Merge "move aoc dump to gs-common"