Merge "Update annotation gen script." into main