Merge "Update API text file format to include missing generic signature"