Merge "Fix json format issue for aai annotation"