Change-Id: I112cf95122a896cdb30a823b4c1f49831273dc7e
Change-Id: I1617ef882e9bcaaaafe58a932fadd803851ec88f
Based on the previous change add a derived class for SAPI4 support. Note that SAPI4 support had been disabled, so it's also disabled to not show in the selection dialog for now. Change-Id: Iffda7daafd9327ef8821c4fe4b1b0fc581607f49