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

* commit '3cf8583a2fe1a2793b4c67098df62f4362b47f0c':
  Combine class sets when writing a class table