Merge "Fix signature generation for nested annotaions"