Merge "Fix pom files for A1 controller"