Merge "Update aai-common dependencies"