Merge "Migrate aaa to global-jjb Maven jobs"