AA: imagebuilder: merge r34301