Revert "Remove preliminary subtypes from E-MR1 release"

This reverts commit 704db5f003eabaee8dcd80838e563865083b73a9.

Bug: 17743363

Reverting due to unit test breakage..

Change-Id: Ie7c1e86e50af2a05b4b7877092122dc4f026aa54
9 files changed