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

* commit 'ccbe8873758d53d83e8e8134dd658cf6a3959480':
  Fix crash in AdditionalSubtypeUtils