Merge "Modify AAI service endpoints annotation"