Merge "Revert "Remove preliminary subtypes from E-MR1 release""