am 44df1394: am 22888291: am 6beb03df: am 6862b819: Fix crash in AdditionalSubtypeUtils

* commit '44df13949a069eb18e99ae6584ff5ac72f1d39aa':
  Fix crash in AdditionalSubtypeUtils