am 8c79bfd7: am ccbe8873: am faf999f8: am a87070b6: am 50f9ca4a: Fix crash in AdditionalSubtypeUtils

* commit '8c79bfd7d71600fca11910cb00ca42a7244b6740':
  Fix crash in AdditionalSubtypeUtils