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

* commit '781a197c4585f1c61662066e7c937133bf7e0d07':
  Combine class sets when writing a class table