Merge "Remove override of parent aaf version"