am 6beb03df: am 6862b819: Fix crash in AdditionalSubtypeUtils

* commit '6beb03df089965d19fc55c2d4179c044db5ca0d6':
  Fix crash in AdditionalSubtypeUtils