Merge "Enable A1 controller image creation"