reconcile with gingerbread

Change-Id: Ifc4ad6e958423ee7058190a87949554f492cd4ce