reconcile froyo CTS variants

Change-Id: I3500118d665df5045d800d2e1d70107b47b52baf