Enable preliminary subtypes for F-release

Bug: 17743363
Change-Id: I098ae6e21a7f2a1ceed1d206740a2d12e1ef7d99
10 files changed