Split Tab2 into it's variants

Change-Id: Ib48da69c301d81749822fac24ffbd093421ea1b9
6 files changed