Reconcile gingerbread variants

Change-Id: I5e68fbe90331f2d9278196a62b97d3ccd2fb7cfa
tree: 9f04be14c989e5a41f8dee79d455af2b7f94e7fa
  1. tests/