Merge "Bug 2191: Invalid use of addType in ChoiceCaseBuilder"