am a87070b6: am 50f9ca4a: Fix crash in AdditionalSubtypeUtils

* commit 'a87070b6c5cfaffa5b2ff58103e5ae2267292d83':
  Fix crash in AdditionalSubtypeUtils