Merge "Added support to generate interfaces from Choices and Cases."