Reconcile gingerbread variants

Change-Id: I5e68fbe90331f2d9278196a62b97d3ccd2fb7cfa