am 2a4aa33c: am 8c79bfd7: am ccbe8873: am faf999f8: am a87070b6: am 50f9ca4a: Fix crash in AdditionalSubtypeUtils

* commit '2a4aa33ca95bb89bca9e3e9c208548c1813a04e7':