Merge "Fix neng communication with AAI"