am 96d97ee2: Merge "Remove preliminary subtypes from E-MR1 release"

* commit '96d97ee23cc325f7045eb3cf3097d614cf35a5ff':
  Remove preliminary subtypes from E-MR1 release