Merge "Add missing argument and return annotations"