Merge "gs-common:aoc: correct aoc information in the bugreport" into udc-d1-dev