Merge "[AAI] Update babel to use maven 3.6"