Merge "Combine class sets when writing a class table" am: 3cf8583a2f am: 781a197c45
am: 97947a81d5

* commit '97947a81d5ad0cccfeec080ba3d0497b066cd296':
  Combine class sets when writing a class table