Merge "Corrected A1 simulator image tag"