Merge "Update to released version of AAI common"