Merge "Update annotations extractor code to handle new annotations" into studio-1.1-dev