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

* commit 'faf999f8de5aca9d6e9ec91ec26eb16abcd60615':
  Fix crash in AdditionalSubtypeUtils